Revert 15826:447db1235adf1bc59bbd76c951716c3df7ee8843.

Re-enables NMI delivery in HVM guests now that hardware task switching
is emulated.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index a83f6cae67a76c92a78a037f5809ee7cfb8acf74..b41295a273710f1221bc96687139578a7ace3c72 100644 (file)
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -306,14 +306,7 @@ int hvm_vcpu_ack_pending_irq(struct vcpu *v, enum hvm_intack type, int *vector)
     switch ( type )
     {
     case hvm_intack_nmi:
-#if 0
         return test_and_clear_bool(v->nmi_pending);
-#else
-        if ( test_and_clear_bool(v->nmi_pending) )
-            gdprintk(XENLOG_WARNING, "Dropping NMI delivery to %d:%d\n",
-                     v->domain->domain_id, v->vcpu_id);
-        break;
-#endif
     case hvm_intack_lapic:
         return ((*vector = cpu_get_apic_interrupt(v)) != -1);
     case hvm_intack_pic: